From f058cc248d0a52c86433c4a8feb7a372a00dceeb Mon Sep 17 00:00:00 2001 From: Drew Parsons Date: Wed, 28 Jan 2026 12:49:12 +0100 Subject: [PATCH] debian/rules: use UPSTREAM_VERSION_ABI to refer to version specific library Currently 9.5, defining package libvtk9.5. Needed to fix handling of Qt modules (don't delete Qt files from qt component packages) --- debian/changelog | 7 +++++++ debian/rules | 6 +++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 189c6fe3f..408e82b5d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +vtk9 (9.5.2+dfsg3-4) UNRELEASED; urgency=medium + + * debian/rules: use UPSTREAM_VERSION_ABI (currently 9.5) to refer to + version specific library (i.e. libvtk9.5) to fix handling of Qt modules + + -- Drew Parsons Wed, 28 Jan 2026 12:46:48 +0100 + vtk9 (9.5.2+dfsg3-3) unstable; urgency=medium * Team upload. diff --git a/debian/rules b/debian/rules index 1a4abddd9..138ecbaeb 100755 --- a/debian/rules +++ b/debian/rules @@ -3,6 +3,10 @@ BUILDDIR = $(CURDIR)/debian/build include /usr/share/dpkg/architecture.mk +UPSTREAM_VERSION = $(shell dpkg-parsechangelog | awk '/^Version:/ { sub("-[^-]*$$", "", $$2); print $$2}') +UPSTREAM_VERSION_ABI = $(shell echo $(UPSTREAM_VERSION) | sed -e 's/[\.\+]dfsg.*$$//' | awk 'BEGIN { FS="."}; {print $$1"."$$2 }') + + nojava_archs=hppa nojava_os=hurd ifeq (,$(filter $(DEB_BUILD_ARCH), $(nojava_archs))$(filter $(DEB_BUILD_ARCH_OS), $(nojava_os))) @@ -145,7 +149,7 @@ execute_after_dh_install: rm -rf $(CURDIR)/debian/tmp/usr/share/licenses find $(CURDIR)/debian/libvtk9-dev/ -name "*Qt*" -delete || true find $(CURDIR)/debian/libvtk9-dev/usr/include/ -name "Q*" -delete || true - find $(CURDIR)/debian/libvtk9*/ -name "*Qt*" -delete || true + find $(CURDIR)/debian/libvtk$(UPSTREAM_VERSION_ABI)/ -name "*Qt*" -delete || true find $(CURDIR)/debian/tmp/usr/share/doc/vtk-*/doxygen -name "_formulas.log" -delete || true find $(CURDIR)/debian/build/Utilities/Doxygen/doc/html -name "_formulas.log" -delete || true -- 2.30.2